ostbuild: Fix documentation dir (should be 'doc')
authorColin Walters <walters@verbum.org>
Mon, 16 Jan 2012 14:57:00 +0000 (09:57 -0500)
committerColin Walters <walters@verbum.org>
Mon, 16 Jan 2012 14:57:00 +0000 (09:57 -0500)
src/ostbuild/pyostbuild/builtin_compile_one.py

index 08d3614f922cbcbc6d63b8075e6046515be6cc58..fb83dcc5757bacfb9c09bcef379302a2e3944697 100755 (executable)
@@ -197,8 +197,8 @@ class OstbuildCompileOne(builtins.Builtin):
     
         runtime_path = os.path.join(self.ostbuild_resultdir, 'runtime')
         devel_path = os.path.join(self.ostbuild_resultdir, 'devel')
-        docs_path = os.path.join(self.ostbuild_resultdir, 'docs')
-        for artifact_type in ['runtime', 'devel', 'docs']:
+        doc_path = os.path.join(self.ostbuild_resultdir, 'doc')
+        for artifact_type in ['runtime', 'devel', 'doc']:
             resultdir = os.path.join(self.ostbuild_resultdir, artifact_type)
             if os.path.isdir(resultdir):
                 shutil.rmtree(resultdir)
@@ -231,7 +231,7 @@ class OstbuildCompileOne(builtins.Builtin):
         for dirname in _DOC_DIRS:
             dirpath = os.path.join(tempdir, dirname)
             if os.path.isdir(dirpath):
-                dest = os.path.join(docs_path, dirname)
+                dest = os.path.join(doc_path, dirname)
                 self._install_and_unlink(dirpath, dest)
     
         for filename in os.listdir(tempdir):